From 3543a545455242c43defb38571daa60e4695446a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 19 Jan 2019 00:00:34 +0000 Subject: [PATCH] Specify the C include for Unix printing API Instead of using the INCLUDE directive inside the sections file, we can specify the default C include in the gtkdoc-mkdb arguments, and override it inside the C sources that need it. --- docs/reference/gtk/gtk4-sections.txt | 6 ------ docs/reference/gtk/meson.build | 3 +++ gtk/gtkpagesetupunixdialog.c | 1 + gtk/gtkprintjob.c | 1 + gtk/gtkprintunixdialog.c | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index ae7361936a..a7db2717a5 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -1,6 +1,3 @@ - -gtk/gtk.h -
gtkaboutdialog GtkAboutDialog @@ -5375,7 +5372,6 @@ GtkPrintOperationPrivate
-gtk/gtkunixprint.h gtkprintunixdialog GtkPrintUnixDialog GtkPrintUnixDialog @@ -5723,7 +5719,6 @@ gtk_print_context_get_type
-gtk/gtkunixprint.h gtkprintjob GtkPrintJob GtkPrintJob @@ -5775,7 +5770,6 @@ gtk_print_job_get_type
-gtk/gtkunixprint.h gtkpagesetupunixdialog GtkPageSetupUnixDialog GtkPageSetupUnixDialog diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build index 66dfc0291f..12147fa674 100644 --- a/docs/reference/gtk/meson.build +++ b/docs/reference/gtk/meson.build @@ -412,6 +412,9 @@ gnome.gtkdoc('gtk4', '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT', '--ignore-headers=' + ' '.join(private_headers), ], + mkdb_args: [ + '--default-includes=gtk/gtk.h', + ], fixxref_args: [ '--html-dir=@0@'.format(docpath), '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')), diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index b836a435ed..5bcd37a6bb 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -49,6 +49,7 @@ * SECTION:gtkpagesetupunixdialog * @Short_description: A page setup dialog * @Title: GtkPageSetupUnixDialog + * @Include: gtk/gtkunixprint.h * * #GtkPageSetupUnixDialog implements a page setup dialog for platforms * which don’t provide a native page setup dialog, like Unix. It can diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index c3d1ce70bb..e8e1c7c3b5 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -19,6 +19,7 @@ * SECTION:gtkprintjob * @Title: GtkPrintJob * @Short_description: Represents a print job + * @Include: gtk/gtkunixprint.h * * A #GtkPrintJob object represents a job that is sent to a * printer. You only need to deal directly with print jobs if diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 2a9a877f9c..6fcd208588 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -62,6 +62,7 @@ * @Short_description: A print dialog * @Title: GtkPrintUnixDialog * @See_also: #GtkPageSetupUnixDialog, #GtkPrinter, #GtkPrintJob + * @Include: gtk/gtkunixprint.h * * GtkPrintUnixDialog implements a print dialog for platforms * which don’t provide a native print dialog, like Unix. It can -- 2.30.2